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
commit gamestart
added help
no message
no message
Merge branch 'vandiggelenj_sprint2' into develop
no message
Merge branch 'zsbxt9_sprint2' into develop
Finished creating territory nodes
Fixed nodes
Fixed nodes and merge conflict
Finished North America node edges
Modified sql file and wrapped up migrations
Merge branch 'develop' into klb6x2_sprint2

Conflicts:
	protected/data/RISKdatabase.sql
Merge branch 'develop' of codeforge.cs.missouri.edu:swe-j into develop