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

Conflicts:
	Test.ipynb