Edited Frontend-Basics
Merge branch 'master' of https://github.com/InteractiveCologne/pickmeapp