beef
merged
Merge branch 'master' into jonas
added columns to bet-list
Merge branch 'mikkel' into jonas

Conflicts:
	css/index.css
	index.html
Revert 4024d69..5e67f0e

This rolls back to commit 4024d698f231813f60e1047797d97eef08a5bacf.
added top-nav div for top buttons
Merge branch 'master' into mikkel
Merge branch 'master' into jonas
Basic setup
added controller
updated angular
lotta changes
modal added
Merge branches 'jonas' and 'jonas' of https://github.com/AreWeThereYeti/BetApp into jonas

Conflicts:
	css/index.css
	index.html
	js/index.js
	src/js/angular.min.js
Revert 5f85ef0..b461c64

This rolls back to commit 5f85ef0e0b9ca9122f48042d51a143348e59e5af.
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.
modal igen
en gang til