Footer

footer sredjen
fix

merge fix
jos jedan fix

JEBENI DS STORE
gitignore

gitignore update
Merge branch 'master' of https://github.com/svemirko/emblem

# By Mirko Igumnovic (1) and filip (1)
* 'master' of https://github.com/svemirko/emblem:
  Delete .DS_Store
  Main nav

Conflicts:
	.DS_Store
	Emblem.Website/.DS_Store
	Emblem.Website/0.4/.DS_Store
	Emblem.Website/0.4/Emblem.Website.0.4/.DS_Store
	css/main.css
	sass/main.scss