Merge pull request #9 from kacper-zylka/jack

Jack
Disabled bootstrap template js
Merge branch 'master' of https://github.com/kacper-zylka/OxHack2014
Removed clean-blog js once again
Fixed broken submit in registration
Changed a couple of html thingys
Changed a couple of html thingys
Merge pull request #11 from kacper-zylka/wojtek

Changed a couple of html thingys
added extra crests
Merge branch 'master' into jack