Merge master into develop

.gitignore

@@ -23,7 +23,7 @@ yarn-error.log*
 
 #local dotfiles
 /.storybook
-/.idea
 /.vscode
+/.idea
 /src/stories
 /src/styles/build

CHANGELOG.md

 # Changelog
 
+## [2.1.3] - 2018-05-24
+
+### Fixed
+
+- Fixed bug causing facility times that started at 12:00pm to show as 12:00am.
+
 ## [2.1.2] - 2018-03-06
 
 ### Changed
@@ -50,4 +56,5 @@
 [2.0.1]: https://git.gmu.edu/srct/whats-open-web/compare/v2.0...v2.0.1
 [2.1.0]: https://git.gmu.edu/srct/whats-open-web/compare/v2.0.1...v2.1-Midnight-Cherry
 [2.1.1]: https://git.gmu.edu/srct/whats-open-web/compare/v2.1-Midnight-Cherry...v2.1.1
-[2.1.2]: https://git.gmu.edu/srct/whats-open-web/compare/v2.1.1...v2.1.2
\ No newline at end of file
+[2.1.2]: https://git.gmu.edu/srct/whats-open-web/compare/v2.1.1...v2.1.2
+[2.1.3]: https://git.gmu.edu/srct/whats-open-web/compare/v2.1.2...v2.1.3
\ No newline at end of file

src/utils/facilityUtils.js

@@ -298,11 +298,11 @@ const convertToMeridianTime = (time) => {
     let amPM = 'am';
     if (timeArr[0] === 0 || timeArr[0] === 24) {
         timeArr[0] = 12;
-    } else {
-        if (timeArr[0] > 12) {
-            timeArr[0] -= 12;
-            amPM = 'pm';
-        }
+    } else if (timeArr[0] === 12) {
+        amPM = 'pm';
+    } else if (timeArr[0] > 12) {
+        timeArr[0] -= 12;
+        amPM = 'pm';
     }
 
     if (timeArr[1] === 0) {