blah
Merge branch 'master' of https://github.com/xwhiteknuckle22/TruckersLog

Conflicts:
	project.properties