Adding shit

Pull request for merging Adding-shit branch into master