update
Merge branch 'master' of https://github.com/ValentinCvetkovski/celfie

Conflicts:
	css/bootstrap.css
	css/main-style.css