arrange
Action Model
fix
Merge branch 'master' of https://github.com/stripealicious/CSC180.git