Happy new year 2014
Merge branch 'master' of github.com:softshake/softshake.github.com