"ajksdhfgjadshkjdfhakjadfs
Merge branch 'master' of https://github.com/SteamShon/angelhack-seoul

Conflicts:
	app/views/emotions/index.html.erb
	app/views/layouts/_header.html.erb