Op
Something
Merge branch 'master' of https://github.com/pawlowskialex/Ify

Conflicts:
	.DS_Store
	app/assets/javascripts/ify_app.coffee
	app/controllers/Application.scala
Merge branch 'master' of https://github.com/pawlowskialex/Ify
Merge branch 'master' of https://github.com/pawlowskialex/Ify
Update prod.conf
Merge branch 'master' of https://github.com/pawlowskialex/Ify