Initial commit.
Merge branch 'master' of github.com:OpenConceptLab/ocl_web

Conflicts:
	.gitignore