updated to 5pm July3

CHANGELOG.md

@@ -29,14 +29,8 @@ Change Log
   ([#316](https://github.com/YaleSTC/reservation/issues/316))
 
 ####New Features
-* Added flash to notify admins/checkout-persons when viewing Reservations 
-  as a different user ([#542](https://github.com/YaleSTC/reservations/issues/542))
 * Added ability to swap equipment objects for checked out reservations
   ([#582](https://github.com/YaleSTC/reservations/issues/582))
-* Revamped the check-in UX ([#172](https://github.com/YaleSTC/reservations/issues/172),[#568](https://github.com/YaleSTC/reservations/issues/568))
-	* Added ability to click div to select the checkbox
-	* Added color cues to indicate selection and overdue status
-	* Added overdue glyph
 * Added the ability to add a deactivation reason to equipment objects
   ([#332](https://github.com/YaleSTC/reservations/issues/332),
 [#572](https://github.com/YaleSTC/reservations/issues/572))
@@ -47,22 +41,24 @@ Change Log
   ([#567](https://github.com/YaleSTC/reservations/issues/567))
 * Set up ActiveAdmin and added superuser role for easy backup
   administration capabilities
-([#546](https://github.com/YaleSTC/reservations/issues/546))
-* Added overdue-checking emails to both patron and admin noting total
-  fees. ([#317](https://github.com/YaleSTC/reservations/issues/317))
+  ([#546](https://github.com/YaleSTC/reservations/issues/546))
+* Added overdue-checkin emails to both patron and admin, noting total
+  fees. ([#317](https://github.com/YaleSTC/reservations/issues/317)
 * Reservation Requests, for patrons who would like to request extended
   reservations (or other reservations that otherwise would not be valid)
 ([#206](https://github.com/YaleSTC/reservations/issues/206))
+* Calendar view of available equipment items
+  ([#12](https://github.com/YaleSTC/reservations/pull/12))
 
 ####Enhancements
-* Removed test/unit ([#612](https://github.com/YaleSTC/reservations/issues/612)) 
-  in favor of marked improvement of Rspec coverage 
-  ([#403](https://github.com/YaleSTC/reservations/issues/403),
-  [#404](https://github.com/YaleSTC/reservations/issues/404),
-  [#584](https://github.com/YaleSTC/reservations/issues/584))
-
+* Added flash to notify admins/checkout-persons when viewing Reservations 
+  as a different user ([#542](https://github.com/YaleSTC/reservations/issues/542))
 * Revamped authentication system with CanCan gem
   ([#419](https://github.com/YaleSTC/reservations/issues/535))
+* Revamped the check-in UX ([#172](https://github.com/YaleSTC/reservations/issues/172),[#568](https://github.com/YaleSTC/reservations/issues/568))
+	* Added ability to click div to select the checkbox
+	* Added color cues to indicate selection and overdue status
+	* Added overdue glyph
 * Upgraded to Ruby v2.1.1 and Rails v3.2.14 ([#535](https://github.com/YaleSTC/reservations/issues/535))
 * Added hidden field to datepickers for blackouts and announcements to
   remove unnecessary date parsing
@@ -75,8 +71,17 @@ Change Log
 * Made all emails much more informative and included links to relevant
   pages on Reservations app.
 ([#519](https://github.com/YaleSTC/Reservations/519))
-* Refactor method update in ReservationsController
+* Refactored update method in ReservationsController
   ([#354](https://github.com/YaleSTC/ReservationsController/issues/354))
+* Upgraded to Font-Awesome v4.1.0. ([#616](https://github.com/YaleSTC/reservations/pull/616))
+* Vastly-improved rspec testing coverage.
+
+####Deprecations
+* Removed test/unit ([#612](https://github.com/YaleSTC/reservations/issues/612)) 
+  in favor of markèd improvement of rspec coverage 
+  ([#403](https://github.com/YaleSTC/reservations/issues/403),
+  [#404](https://github.com/YaleSTC/reservations/issues/404),
+  [#584](https://github.com/YaleSTC/reservations/issues/584))
 
 ###v3.2.0