...
Merge branch 'master' of https://github.com/G74un3/IntDes-prototype.git
add_iframe and remove_iframe added, also shnitxels
Merge branch 'master' of https://github.com/G74un3/IntDes-prototype.git

Conflicts:
	js/wheel.js
Fixed a commit and shnitxels