merge
Merge branch 'master' of https://github.com/MKBid/TUBE.git

Conflicts:
	static/js/javascript.js