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

Conflicts:
	app/views/posts/_form.html.erb