Fixed bug # 11.
Merge branch 'master' of http://github.com/asonix/mediasite into circuitcontrib
Truly fixed bug #11.
Added circuit logo picture
Merge branch 'asonix' of http://github.com/asonix/mediasite into circuitcontrib
added joke
Initial changes

I think I’ve nailed down a decent colour scheme, I need to run through
and clean up my code. I’d recommend some changes to typography and some
more padding, as well as killing the follow feature of the footer.
Clean up

Should be good now. There is some CSS in there that I didn’t touch,
because the classes weren’t referenced, or I couldn’t find the html
file that contains those referenced classes. HMU on Facebook if you’ve
got any more issues, or G+.

Cheers!
Merge branch 'master' of https://github.com/asonix/mediasite

Conflicts:
css/colors.css
Conflict troubles

Having some issues with conflicting files on colors.css… :/
fixed Price's mistakes
fixing
Pls work

Test post please ignore.
Body colour change
Box shadow changes
Color fixes
Updated footer colour
prepared for merging
test
stuff