New Message
New Message
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/libraries/Generated_files.xml
	app/index.html
	app/scripts/app.js
	app/scripts/app.ts
	app/scripts/controllers/HomeCtrl.js
New Message