Merge branch 'redesign'
Merge branch 'master' of https://github.com/nightlightweb/nightlightweb.github.com