Merge pull request #1 from ButlerSource/Lincoln

Lincoln
Testing changes. Commit to master
Resolving errors in World and Location classes
Added bundle cards
Pulled updates from Master / updates to Location and World class