dev
Merge branch 'dev' of https://github.com/darkrai0101/project-luna into dev

Conflicts:
	app.js