ignoring subdirectory ignore files
Merge remote-tracking branch 'origin/master'
cleanup
reverted horse stuff