Saving local changes
Merge branch 'master' of https://github.com/carlhuda/janus

Conflicts:
	.gitmodules