commit
Merge branch 'master' of https://github.com/andybaoxv/computer_vision

Conflicts:
	proj1_S1_load_data.py
commit