First Commit
Merge branch 'master' of https://github.com/qjaada/loch-web

Conflicts:
	README.md