changes

chnages
location

location
 catch up
changes

changes 21st
zig to marv

zigama to marvin
ui improvements

ui stuff
Merge pull request #3 from watshisface/master

zigama to marvin