Backuped

Conflicts:
	index_1.html
	index_2.html
	scss/style.sass
	stylesheets/app.css
	stylesheets/style.css
Finished backup