trying to fix my static logger binder
Stashing changes before pull
Merge branch 'master' of github.com:kpietrow/charlie

Conflicts:
	nbproject/project.properties
Merge branch 'master' of github.com:kpietrow/charlie
Merge remote-tracking branch 'upstream/master'
difference in our project.properties file is simply due to the different file systems on our computers