.
Merge branch 'master' of https://github.com/victordahlin/AgendaBuilder

Conflicts:
	css/style.css