Dump of Bootstrap
Merge branch 'master' of https://github.com/kroboga/it355project

Conflicts:
	index.php