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 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' of https://github.com/AreWeThereYeti/BetApp into jonas

Conflicts:
	index.html
Merge branch 'jonas' of https://github.com/AreWeThereYeti/BetApp into jonas
Revert 5f85ef0..e3e6e76

This rolls back to commit 5f85ef0e0b9ca9122f48042d51a143348e59e5af.
Merge branch 'jonas' of https://github.com/AreWeThereYeti/BetApp into jonas

Conflicts:
	index.html