removed global project.properties file. MAKE SURE YOU COPY YOUR PROJECT.PROPERTIES FILE AND COPY IT BACK INTO YOUR DIRECTORY AFTER YOU PULL. THIS PULL WILL DELETE IT FROM YOUR REPO
Merge branch 'master' of https://github.com/mECEspring2014/app