working on front
Merge branch 'master' of https://github.com/KryptoKnight/HackZurichMG