d3 cleanup
updating
Merge branch 'master' of https://github.com/n2diving/fistfive
Git pull friday
working on button
friday commit
Merge branch 'master' of https://github.com/n2diving/fistfive

Merging remote with local
Merge pull request #49 from n2diving/login

housekeeping:
dataview 4
Merge branch 'development'
fixed merge conflicts, added most recent data work from chad & alexis
slight changes to dataview
Added some user model tests.
Merge pull request #50 from n2diving/dev

d3 Cleanup
Merge branch 'conditional_show'
Student/Instructor login/signup is now working properly