Added some basic styling
Merge branch 'master' of https://github.com/magnarw/wonderbar

Conflicts:
	server.js