Updated stuff
Merge branch 'gh-pages' of https://github.com/whoisduley/Mashup into gh-pages

Conflicts:
	mashup.css