Added annotate gem and annotated current models
Saving lockfile
Removed duplicate route block
Devise and Foundation Topbar changes

Added devise gem and commented out the implementation in people
controller
Reformatted the top bar from Foundation for responsive resizing
Make active page work with current_page

Use current_page check for active state
App erg update
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Gemfile.lock
	config/routes.rb
Updates for pull request comments
Merge pull request #3 from electricpineapple/master

Foundation topbar, Devise added