Updated files from Mid May since I haven't pushed files since April
May update
Merge branch 'master' of github.com:letubeu/happilabs