All project files committed.
	new file:   COPYING
	modified:   README.md
	new file:   README.md~
	new file:   index.html
	new file:   js/app.js
	new file:   js/flash.js
	new file:   js/morse.js
	new file:   lib/jquery-2.1.1.min.js
	new file:   manifest.webapp
	new file:   privacy-policy
	new file:   privacy-policy~
	new file:   style/icons/icon.svg
	new file:   style/icons/icon128x128.png
	new file:   style/icons/icon16x16.png
	new file:   style/icons/icon48x48.png
	new file:   style/icons/icon60x60.png
	new file:   style/style_sheet.css
Merge branch 'master' of https://github.com/mdq3/multiflash

Conflicts:
	README.md