Updated some stuff
Revert "Updated some stuff"

This reverts commit 37141f9cd1978eee38051a03d624d8437bc82f08.
Merge branch 'master' of https://github.com/Ironarcher/Netcraftv2.0