Edit / add ideas
Merge branch 'master' of https://github.com/svenstaro/uni-projekt