Updating for HW6
Still trying to fix
removed space at top
Merge branch 'develop' into staging