stuff
adding git ignore
fixing module merge