first commit to deploy on heroku
trying to deploy on heroku
trying to deploy on heroku vol. 2
++
fixing mysql
trying to get heroku working
config.assets.initialize_on_precompile = false!
asset precompile no in right position app.rb
tidy up on Gemfile
++
updated Gemfile.loc
added sass
added ruby v in gemfile
added line @fontAwesomeEotPath_iefix: asset-path(fontawesome-webfont.eot#iefix)
Merge branch 'master' of github.com:MarcoSero/lifeofadev.eu

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/bootstrap_and_overrides.css.less
	app/views/posts/_post.html.erb
	config/application.rb
	config/deploy.rb
	public/system/paperclip_attachments.yml
	test/unit/user_test.rb