init
added remote
fixed conflicts in .gitignore