Initial commit from mbair
Merge branch 'master' of github.com:sameg14/projects

Conflicts:
	python/.idea/misc.xml
	python/.idea/workspace.xml