First Commit
Merge branch 'master' of github.com:zbyerly/gameoflife_adcirc

Conflicts:
	.gitignore