initial commit
Merge branch 'master' of https://github.com/douglasknudsen/atlcodecamp2013

merge local