air
Merge branch 'master' of https://github.com/koke6645/CSC478

Conflicts:
	HW/Assi2/Assignment_2_Problem_1.ipynb