Merge branch 'develop' of https://github.com/AgreeMates/AgreeMates into develop
Fix nav controller
Merge pull request #44 from amitburst/navctrl

Fix nav controller
Updated instructions
Updated stuff
package.json updated with passport adn express-session
Merge pull request #47 from NickRomeroEvans/develop

package.json updated with passport and express-session
Merge remote-tracking branch 'upstream/develop' into develop
Added comments to some routes
Commented first half of the routes (apartment-chores
add comments to all files in public/app
Merge pull request #50 from samzhao88/frontendComments

add comments to all files in public/app
Merge pull request #48 from heierj/develop

Added comments to routes
Merge pull request #49 from NickRomeroEvans/comments

Commented first half of the routes (apartment-chores)
Updated vagrant stuff for a better path and basic postgresql
Updated instructions
Merge pull request #51 from Wizecoder/more-vagrant

More vagrant stuff
Add back in viewport meta tag
Merge pull request #53 from amitburst/fix-viewport

Add back in viewport meta tag
merged conflicts