git ignore fix
Gemfile cleanup
Adding boostrap sass instead bootstrap
Blank avatar
add public in .gitignore
clear cash
Merge branch 'develop'

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	IMC.sublime-workspace
	app/assets/javascripts/application.js
	app/assets/stylesheets/custom.css.scss
	public/assets/application-a3884db01b2c8bad26059bb668507be3.js
	public/assets/manifest-57047075059abeba6267de5efac95e70.json
Merge branch 'master' of github.com:AstraL/IMC into develop

Conflicts:
	app/models/user.rb