Merge github.com:Stedwell/General
Merge github.com:spsu-auv-team/General
Merge github.com:spsu-auv-team/General
Updating the license and README
Updating the license and README
Revised Proposed Constitution
Update README.md
Merge pull request #32 from Stedwell/master

Conflicts:
	README.md
consolidating files

Bennett