things
Merge branch 'master' of https://github.com/CMPUT301F14T14/Project into NewStuff

Conflicts:
	QuestionApp/src/ca/ualberta/cs/cmput301f14t14/questionapp/data/DataManager.java
added adjustment to accomodate localdatastore to datamanager.
Merge pull request #78 from RyanKusters/NewStuff

New stuff