added archived? and archive! methods to the reservations model, added archive action to reservations controller, archive column migration
renamed the archive migration from add_archive_button to add_archive_column
added the archived status column to the database, created archived route, cleaned up whitespace in JS files, added simplecov to the Gemfile
not done with the JS for the archive button
fixed merge conflicts with master
archive button works and removes that reservation from the page
fixed merge conflicts with paul's push to master
Merge pull request #54 from gopher-snakes-2013/archivebranch

Archivebranch