This stuff doesnt even work
Fixed stuff! :)
Fixed conflict
Added the files I changed
Merge branch 'master' of https://github.com/keyaral/Agile