AaronM - Increment game date by two months only on story events not random ones
Merge branch 'master' of github.com:AliceYuan/SpaceAppsHackathon

Conflicts:
	js/main.js
AaronM - Update research manager to take in both research and constructs
AaronM - Create stubs for research actions and the research model
Merge branch 'master' of github.com:AliceYuan/SpaceAppsHackathon