add more default (can call changeDefaults)
Merge branch 'master' of git@github.com:pirest89/demo.git

Conflicts:
	gittut/src/gittut/Main.java