removed old java files
Merge branch 'master' of github.com:curtisullerich/butterflies
fixed naming errors and updated gitignore to handle eclipse files
changed a 3 to a 5.
Merge branch 'master' into SurveyingPageWIP