merge
expanding gitignore
adding pony-mode as a submodule