Merge remote-tracking branch 'kpike1/master'
unfinished merge?
idk
added unnecessary bin directory to .gitignore