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
Implement auth
Added Initial inventory models
More inventory setup
Adding Calendar/Events
Working on scheduling
More event updates
Added notes schema and relationships to person and visits
Remove event type
Made table headers left aligned for events
Added event columns to visits table
Annotated models
update from master