Spiral second attemps
Merge branch 'master' of github.com:2014-codeteam/2014-codeteam