Added an intro type of camera (not fully finished yet)
Merge branch 'master' of https://github.com/rstaewen/Pharos

Conflicts:
	Pharos.userprefs