pulling from Master
resolved conflicts
added registration css
resolved tv.coffee conflict
Merge pull request #3 from mluus/master

Pulling master back to Nathan