Merge branch 'master' into mikkel
Basic setup
added controller
updated angular
lotta changes
Merge branch 'jonas' into mikkel

Conflicts:
	index.html
	src/css/bootstrap.min.css
	src/css/topcoat-mobile-dark.min.css
	src/fonts/SourceCodePro-Black.otf
	src/fonts/SourceCodePro-Bold.otf
	src/fonts/SourceCodePro-ExtraLight.otf
	src/fonts/SourceCodePro-Light.otf
	src/fonts/SourceCodePro-Regular.otf
	src/fonts/SourceCodePro-Semibold.otf
	src/fonts/SourceSansPro-Black.otf
	src/fonts/SourceSansPro-BlackIt.otf
	src/fonts/SourceSansPro-Bold.otf
	src/fonts/SourceSansPro-BoldIt.otf
	src/fonts/SourceSansPro-ExtraLight.otf
	src/fonts/SourceSansPro-ExtraLightIt.otf
	src/fonts/SourceSansPro-It.otf
	src/fonts/SourceSansPro-Light.otf
	src/fonts/SourceSansPro-LightIt.otf
	src/fonts/SourceSansPro-Regular.otf
	src/fonts/SourceSansPro-Semibold.otf
	src/fonts/SourceSansPro-SemiboldIt.otf
	src/js/angular.min.js
Revert d92aa2c..17c2645

This rolls back to commit d92aa2c55727eee432df1348a479240b48e55ac0.
Merge branch 'MiniJonas' into mikkel

Conflicts:
	index.html
merged
added button and jquery
Working
Merge branch 'mikkel'
Merge branch 'master' into jonas

Conflicts:
	index.html