About us intro
Merge branch 'master' of https://github.com/MagicKamote/UNI5Final

Conflicts:
	about.html