init
Merge branch 'bootstrap' of https://github.com/stsdc/mkn-synergia-theme

Conflicts:
	404.php
	comments.php
	footer.php
	functions.php
	header.php
	index.php
	page-templates/portfolio.php
	page.php
	readme.txt
	style.css