i have no idea
Merge branch 'master' of github.com:OOKB/rg-client-app

Conflicts:
	static/about/index.html
begin the react menu app