merge error
adds method for 5 array users
fiexes conflict
Merge branch 'master' of https://github.com/matt16749/gitwithit