Basic Parses and Get Working
Merge branch 'master' of https://github.com/Albertoruis/appathon-spring-2014.git