stuff
Merge branch 'master' of https://github.com/MultimediaOn10/t3confinal

Conflicts:
	css/main.css
	js/main.js