add interfaces file
git remote dev
Merge branch 'dev' of github.com:neunicholaslee/gitskills into dev
uncomment line 4
uncomment line 5
solve interfaces file conflict
merge with no-ff,interfaces to master