have to fix merge...'
Merge branch 'master' of github.com:uscacm/Team10_FallHackSC
add item.... was working