Added logout functionality
Haul password change code over into UsersController
Begin working on lock timeout
Merge branch 'develop' into develop-nigel-users

Conflicts:
	config/routes.rb
Added JS countdown with 5 seconds instead of 600 of idle time
Countdown is ready to roll, still low times though
Lockout timer and associated specs are now fully functional!
Forgot password functionality is in
Ricky changed his mind on email again
Merge branch 'develop-nigel-users' into develop

Conflicts:
	config/routes.rb
	db/schema.rb
Updated readme, cleaned garbage from routes
Shouldn't schema.rb not be in the repository?
removed activities from schema
Merge branch 'develop-nigel' into develop
Created example for seeding data
Created example for seeding data
Merge branch 'develop-ricky' into develop
Created example for seeding data
Fixed David's drag and drop simulation
Cleaned up content not being used