fixed conflicts
wtf what is going on
Merge branch 'master' of https://github.com/aly006/ia_187
fixed shit