Add ignore bootstrap.php.
Merge branch 'master' of github.com:cozynooks/reb2000

Conflicts:
	.gitignore
	include/bootstrap.php
Merge branch 'master' of github.com:cozynooks/reb2000

Conflicts:
	include/bootstrap.php
130412