some basic elements added
Merge branch 'master' into first-section

Conflicts:
	app/assets/stylesheets/application.css.scss
Section one implementation
Merge branch 'first-section'