test light diagram
Merge branch 'master' of https://github.com/gnusgnoy/sample-app

Conflicts:
	Gemfile