Trying sth!
Tried to load other .js file
Merge branch 'master' of github.com:yAnalytics/yanalytics

Conflicts:
	js/auth.js