first commit
Merge branch 'master' of https://github.com/jcope2013/MeteorShop

testing