asd
asd
asd
aasdMerge branch 'master' of https://github.com/nickjoodi/formatting

Conflicts:
	src/eclipseFormatter.java
	src/testing.java
asdasd
sdas