image uploader
Merge branch 'master' of https://github.com/SteamShon/angelhack-seoul

Conflicts:
	Gemfile
	app/views/layouts/_header.html.erb