Don't push it push it real bad
commit to fit
Merge remote-tracking branch 'origin/master'

Conflicts:
	Git Example/src/com/bayviewglen/dayeight/ExampleOne.java