merging #15

Conflicts:
	app/scripts/main.js