+ initial commit
+ fixing gitignore merge conflict; i know, right?