Merge remote-tracking branch 'jcoady9/master'
added and edited the war folder. changed a few things in database to get
the web service working.
Merge remote-tracking branch 'sbonner1/master'
test