dbfile
Merge branch 'master' of https://github.com/ArielBadichi/aws-hackathon-2014

Conflicts:
	server/package.json