double checking b4 breaking
commiting after pulling
Merge branch 'master' of github.com:vikasagartha/lsst_test

Conflicts:
	pyramid/pyramid.py