traviscole/quikshop — pull request #6 by traviscole (2014-04-04 16:12:49+00:00)
Title: Merging App and master before 04/04 meeting

Basic merge from App to Master to make everything the same