some basic elements added
Added font awesome
updated gems
Merge branch 'master' into first-section

Conflicts:
	app/assets/stylesheets/application.css.scss