Temp commit so I can work on macbook, after starting migration to bs3
Merge branch 'master' of https://github.com/pth81/darrach.net

Conflicts:
	css/style.css