Added wall/pyramid states; L/R IR stuck detection
Merge branch 'master' of https://github.com/sciencewiz1/maslab-staff-2013

Conflicts:
	states.py

try merge