(refactor) randomFactory refactor
(bug) Gruntfile.js now looks for index.js
Merge pull request #11 from robotBones/master

(bug) Gruntfile looks for index.js instead of server.js to start server
Merge pull request #12 from jangahroo/master

updates
Merge pull request #13 from jangahroo/master

fixed my collections and links
Merge pull request #14 from jangahroo/master

fixed collection controller
(bug) set collectionFactory.collection.links to []
Merge branch 'master' of https://github.com/NiteOut/curates

Conflicts:
	client/modules/singleCollection/singleCollection.js
injected bcrypt and jwt
installed bluebird
injected Q
refactored login
authentication complete
token returning properly
Merge pull request #15 from jimjea/master

created password hashing and token generating
Merge branch 'master' of https://github.com/NiteOut/curates
Merge pull request #16 from robotBones/master

(bug) angular voteLink interface to server changed
fixed linking error
fixed collection controller... again...
removed debug log