Added users to table. Not working
There is a conflict. I'm not sure what it is.
Merge branch 'master' of github.com:mpdavis/vinz into web
added css and js files to grunt and index
I don't know why there is a conflict.
Merge branch 'master' of github.com:mpdavis/vinz into web
Merge branch 'master' into web

Conflicts:
	Gruntfile.js
	app/index.html
added missing comma
Merge branch 'master' of github.com:mpdavis/vinz into web
Merge pull request #73 from mpdavis/scanner

Scanner
docstring
Updated the users page.
Adding activity logs backend and beginning of frontend page
Merge pull request #75 from computmaxer/activity_logs

Adding activity logs backend and beginning of frontend page
whitespace
Catching DoesNotExist errors
added username and password to new user. Still needs some work though.
Merge pull request #65 from ericfeldmann/web

Added users to table.
Merge branch 'master' of gh-personal:mpdavis/vinz into scanner