local project properties
fixed project properties conflict
modified .gitignore so we don't have to keep messing around with properties files