Renamed my-app.css and my-app.js
Started authorization javascript
Added files not added to commit before
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	index.html