pulling
Merge branch 'master' of github.com:cwelch7/3307A-work-assignments
Progress on UI functions
fix collisions