c
a
b
Merge branch 'master' of https://github.com/eyanai/nextStar_app

Conflicts:
	js/script.js