1st time doing this crap, hope it works
Removed .gitignore from this branch
Updated docs
Added alias clash detection
Changed wether to whether
Fixing failed merge