project index changes
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/ilyaulyanov/projek

Conflicts:
	public/css/app.css