Maj functions.php
Merge branch 'master' of https://github.com/Stimboy/Bootstrap

Conflicts:
	functions.php