fonts
aws
env
other try to solve env
other try to solve env
grunt and trying to get things working again after major cleanup
starting to work better
startpage content
added bower json and turned off too exluding gitignore
remove trailing slash
upgrade docpad
Merge branch 'master' into optimize

Conflicts:
	Gruntfile.js
	docpad.coffee
	package.json
	src/files/content/vendor/angular.js
	src/files/content/vendor/css/highlight.css
	src/files/content/vendor/css/prettify.css
	src/layouts/blogg-category.html.jade
	src/layouts/blogg-main.html.jade
	src/layouts/blogg.html.jade
	src/layouts/default.html.jade
	src/mixins_and_partials/angular_partials/github.jade
	src/mixins_and_partials/angular_partials/heading.jade
	src/mixins_and_partials/angular_partials/image-gallery.jade
	src/mixins_and_partials/angular_partials/instagram.jade
	src/scripts/app.js
	src/scripts/revolutnet/revolunet-angular-carousel.js
removed functions
new navigation
Merge branch 'optimize' of github.com:Iteam1337/iteam-se.docpad into optimize

Conflicts:
	package.json
	src/documents/index.html.jade
	src/documents/jobb/index.html.jade
Merge branch 'design' into optimize

Conflicts:
	src/documents/index.html.jade
slider
Merge branch 'design' into optimize
slider with showcases
section in slider and minor fixes