corals (wip)
more stuff
add gitignore
Merge branch 'master' of github.com:residualmind/31c3aquarium

* 'master' of github.com:residualmind/31c3aquarium:
  added .gitignore

Conflicts:
	.gitignore