Gitignore
Merge branch 'master' of https://github.com/patricktuin/weddingangular

* 'master' of https://github.com/patricktuin/weddingangular:
  not finished
  Changed main page and nabber at advice of Bart

Conflicts:
	.sass-cache/2142339589588daf5308640581eb33d52f81fe82/_index.scssc
	.sass-cache/2142339589588daf5308640581eb33d52f81fe82/main.scssc
	css/main.css
	sass/_colors.scss
	sass/_index.scss
	sass/main.scss
	templates/home.html