Ignore sublime files
Merge with master