stuff
Merged
merged
Coding in mario's UI.
merge
implemented location info method