Tidy as you go for a happy household.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/mineTwit/Main.java