working on plus results
Merge branch 'master' of github.com:vcnickerson/SkyNetHackathon

Conflicts:
	public/javascripts/page.js