Require JS finally WORKSSSSS!!!
'ss'
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/svet15.iml
	app/index.html
Require JS finally WORKSSSSS!!!