Foot stuffs
updated crown stuff
Merge branch 'Foot'
Confilct Resolution