Some problems with untracked files
Merging from ec2 copy
Merging from origin
Merge branch 'master' of https://github.com/apanella/wopr-api

Conflicts:
	.gitignore
Merging from origin master
Added submodule for Voronoi triangulation