init commit
fixed .gitignire conflict...oops