Finally commit upgrade
Merge branch 'AudreyBranch' into LeslyTestAgain
Latest contins Audrey, Brandon Desc, and Lesly
Score Screen now Displaying
Altered the score on the score screen
Merge remote-tracking branch 'origin/master' into AudreyBranch

Conflicts:
	farm_adventure/src/com/aa_software/farm_adventure/model/item/crop/BeetCrop.java
	farm_adventure/src/com/aa_software/farm_adventure/presenter/screen/farm_screen/AbstractFarmScreen.java
Merge branch 'AudreyBranch' into LeslyTestAgain
Completed the score screen

Default score set to 0
Screen layout symmetric
Select Button and Seed Count
Merge branch 'AudreyBranch' into LeslyTestAgain
Working tutorial up until irrigation
Commit[Adam]: Added Justin's Test images
Commit[Adam]: Added test music
Tutorial fixes
Fixed error with leftB4
Tutorial's irrigation portion should be smoothed out.
Merge remote-tracking branch 'origin/AudreyBranch'

Conflicts:
	farm_adventure/src/com/aa_software/farm_adventure/presenter/screen/farm_screen/TutorialFarmScreen.java
Merge branch 'master' of https://github.com/AA-Software/farm-adventure
just changed the costs of seeds vs plants
changed the time to 4 minutes