Forgot to do this in the last round of commits
Merge pull request #27 from Venture-TheSphinxTeam/dev

Changing datatypes calls for changing code
Update README.md
Lynx
Merge pull request #28 from ShadowSam/master

Adding framework for 'subscribe' and other buttons on dashboard entitites
Merge branch 'dev'
Objects for Events started and Queryable objects for entities updated
Merge branch 'dev' of https://github.com/Venture-TheSphinxTeam/Sphinx into dev
Updated tool to upsert risks and milstones as well
Merge pull request #29 from Venture-TheSphinxTeam/dev

Dev
refactoring entity method
Merge branch 'dev' of github.com:Venture-TheSphinxTeam/Sphinx into dev
Merge pull request #30 from Venture-TheSphinxTeam/dev

Dev
adding conditional check for entity type in dynamic page generation.
Fixing query strings
Added in Db mathods for grabbing milestones and risks by ID
Added fields to initiative page
Revert "making this project work nicely with eclipse"

This reverts commit a823a21ee26478c4ea26ad8afcfc77fc8fb0a31c.

Conflicts:
	conf/application.conf.test
Adding bootstrap.css
Merge pull request #2 from ShadowSam/master

Small update to readme and test push from Sam's fork.