mapreduce
Merge branch 'master' of https://github.com/kuntae/Baas

Conflicts:
	bacas/.idea/workspace.xml