no changes why is github asking me to commit?
Merge branch 'master' of https://github.com/vasyaivanov/mobremcon

Conflicts:
	.DS_Store
	www/.DS_Store