update
Merge branch 'master' of https://github.com/hasherr/GDSESummerJam2014