commit to pull
Merge branch 'master' of https://github.com/trunghieuhust/viye

Conflicts:
	app/controllers/application_controller.rb
	app/views/layouts/application.html.erb
	db/development.sqlite3
	log/development.log
user profile