design stuff
Merge pull request #6 from amsterdamhackathon/henry

design stuff
design and cleanup
Merge pull request #7 from amsterdamhackathon/henry

design and cleanup
user object voor watterna
Merge pull request #8 from amsterdamhackathon/henry

user object voor watterna
added user type
Merge pull request #9 from amsterdamhackathon/watterna

Watterna
settings for local dev and live server
Merge pull request #10 from amsterdamhackathon/henry

settings for local dev and live server
Merge branch 'master' into watterna
Update