add sublime project
attempting to fix conflicts
cleaning up my conflict files and hopefully not wrecking anything more
Miscellaneous changes and css changes in Chapter 7
Merge branch 'sign-up'

Adding small changes from Chapter 7