Commit for conflict
Merge branch 'master' of https://github.com/evanderploeg/Test

Conflicts:
	src/test.java