started editing fan plotting code
temp commit
fan plotting is working
fixed ampere indent
Merge branch 'master' into marathon

Conflicts:
	.gitignore
added gitignore back
fixed some poes bugs, added scanData class
updating amepre download
added stuff to ampere
Merge branch 'marathon'

Conflicts:
	.gitignore
	utils/plotUtils.py