proves
aa
Merge branch 'develop' of github.com:Undertile/UrlShortener into develop

Conflicts:
	node/md5.js
	node/server.js