no message
Merge branch 'develop' of codeforge.cs.missouri.edu:swe-j into zsbxt9_sprint2

Conflicts:
	js/risk.js
Fixed nodes
no message
Styling changes and a little clean-up in the controllers.
Merge branch 'develop' of codeforge.cs.missouri.edu:swe-j into ahnera_sprint2