test3
Merge branch 'pull-request-test1' of https://github.com/kukoto2/Album into pull-request-test1

Conflicts:
	album/App/server.js
test6