minor commit
Merge remote-tracking branch 'jcoady9/master'
Merge remote-tracking branch 'jcoady9/master'
Merge remote-tracking branch 'jcoady9/master'
Merge remote-tracking branch 'jcoady9/master'
some minor changes to databaseapp
Merge remote-tracking branch 'jcoady9/master'
deleted persistence project
Merge remote-tracking branch 'sbonner1/master'
fixed R.java file