updated main.html
Merge branch 'master' of github.com:danielabar/flashlang

Conflicts:
	client/app/views/main.html
fixed merge conflict
Merge commit 'b2ee24aa1fa0f79f72054f4e91a3b9cdf5da8873'