Showing conflict resolution, i hope :P
Merge branch 'master' of https://github.com/evanderploeg/Test

Conflicts:
	src/Test2.java
	src/test.java