no message
Merge branch 'master' of https://github.com/endario/git_demo into mac
no message
Merge branch 'mac'
Merge branch 'master' of https://github.com/abergitdemo/git_demo into feature

Conflicts:
	dev/src/Main.java