papper 1,2
Merge branch 'master' of https://github.com/ValentinCvetkovski/celfie

Conflicts:
	css/navbar-fixed-top.css
	index.html