intial commit
Merge branch 'master' of https://github.com/dospatos/h3.seankraft-fall2013.biz