cleaned code
Merge branch 'master' of github.com:joakimmj/Wapp
Merge branch 'master' of github.com:joakimmj/Wapp
Merge branch 'master' of github.com:joakimmj/Wapp
i made stuff