delete avg
delete avg
edit mainCentroid
adding file findCentroid.py
modify findCentroid.py , and add findSlope.py and mainCentroidSingleLens.py
add documentation file centroid_doc.tex
add throw away apertures mechanism to file centroid_doc.tex
add test_centroid.py and modify findCentroid.py
modify mainCentroid.py fix all problems, add test_centroid.py
merge master into centroid branch
Merge branch 'master' of github.com:faitdivers/pyao into centroid

Conflicts:
	src/Centroid/mainCentroid.py
	src/main.py
modify mainCentroid, change masking into defining row-column of intensities
update mainCentroid
modify mainCentroid.py
modify mainCentroid.py, delete unwanted syntax error
fix error in test_centroid.py +from mainCentroid_trial import *, delete unnecesary return function
modify mainCentroid for general geometry of lenslets
modify mainCentroid to be able to work in different geometry of lenslet structure
fix the conflict
fix the conflict