Merge branch 'master' into rissa
fixed the stuff
Merge branch 'master' into rissa

Conflicts:
	public/TAwesome.css
Merge pull request #53 from TAwesome/rissa

Rissa
Merge branch 'master' into Jacob