all
Merge branch 'master' of https://github.com/gg-trickitty/ejero

Conflicts:
	app/index.html
Merge branch 'master' of https://github.com/gg-trickitty/ejero

Conflicts:
	app/index.html
	app/styles/main.scss
Invite friends