Timelog
Merge branch 'master' of https://github.com/anantmote/Devise-Invitable

Conflicts:
	app/controllers/pages_controller.rb
	app/models/userlog.rb