Merge branch 'master' into feature/2_admin_posts
Merge branch 'master' into feature/2_admin_posts
Merge branch 'feature/2_admin_posts' of https://github.com/savayg/buzzstarter-training into feature/2_admin_posts
cleanup javascripts
[#2] PR comments resolved.
Merge branch 'feature/2_admin_posts' into feature/3_homepage

Conflicts:
	app/admin/post.rb