Minor changes
Merge branch 'master' of https://github.com/alling9495/CalHacks2014-Stikit-App