fpic-debugging
fpic-debugging-2
Merge branch 'master' of github.com:badgerman/atlantis

Conflicts:
	CMakeLists.txt