Edited 2013-09-02
Edited 2013-09-02

Merge branch 'master' of https://github.com/camposfa/Transects

Conflicts:
	.gitignore