no message
Merge branch 'master' of https://github.com/axelsvanfeldt/grupp5

Conflicts:
	bas.php