git ignore fiasco
troubles - Merge branch 'master' of github.com:rsoden/epic