bootstrap
Merge branch 'master' of https://github.com/lukeeee/Royal-Hearts

Conflicts:
	header.php
	public/index.php
	public/login.php