Upgraded to Bootstrap 3
Merge branch 'gametime'

Conflicts:
	.DS_Store
	WebPages/.DS_Store