rocket landing and messages popping
Merge branch 'master' into landing_pad

Conflicts:
	public/js/controller.js
	public/js/view.js
Merge pull request #12 from jasminmayfield/landing_pad

Landing pad