Merge branch 'master' of https://github.com/spring-peepers-2014/Giggidy