failed experiment T_T
failed exp
Merge branch 'master' of https://github.com/cishak/IAT455

# By tiphanielau
# Via tiphanielau
* 'master' of https://github.com/cishak/IAT455:
  Matt's stuff

Conflicts:
	main2.js