integration testing completed
Merge branch 'master' of https://github.com/arzhed/snapgram

Conflicts:
	test/functionalTest.js
Merge branch 'master' of https://github.com/arzhed/snapgram