Initial commit
fixed conficts
add sublime text files to ignore