Initial commit setup
Merge branch 'master' of github.com:vnavarro/SPJAM2013