Basic functionality
Merge branch 'master' of github.com:rbalicki2/LaunchLy

Conflicts:
	css/style.css
	js/app.js
	manifest.json