- cleanup
Merge remote-tracking branch 'upstream/master'

Merge client & server branches
Merge remote-tracking branch 'upstream/master'

Another merge
Merge branch 'master' of https://github.com/michalbe/loremipsum

Another merge
Merge branch 'master' of https://github.com/michalbe/loremipsum

Another merge
- server cleanup
Merge remote-tracking branch 'upstream/master'

Conflicts:
	server.js
Merge pull request #2 from siemiatj/master

General server cleanup