added node modules to gitignore
added package json
Merge branch 'master' of https://github.com/TIY-Q3-ROR-CHS/Team3
no changes, just need to pull upstream master
no changes, just need to pull upstream master
Merge pull request #20 from bjlinville1/master

added workflow gem and workflows to user.rb. need to pull the route.rb resources down to continue