A BIG UPLOAD

the website is like 70% ish finished :DD
Merge remote-tracking branch 'origin/master'

Conflicts:
	style.css
one damn good lookin app

whoohooo