updated current status
minor edit

I thought merging made sense but couldn't figure it out in Tower.
Merge remote-tracking branch 'origin/no-js'

Conflicts:
	README.md
tiptoeing into Sass & cleaning up
Merge branch 'master' of github.com:katywatkins/Not-Your-Average-Bird into no-js

Conflicts:
	README.md