gitignore
gitignore
refactor js
put things into css file
refactor js and css
cleanup
cleanup
delete unnecessary conditional
Merge branch 'master' into rspec