Merge pull request #6 from ltbesh/Develop

User can search courses by tag
Add account
Merge remote-tracking branch 'coursLucas/Develop'

Conflicts:
	client/main.js
Merge remote-tracking branch 'coursLucas/master'
resolve merge pb main.js
Merge pull request #8 from Dadaoxy/master

resolve merge conflict main.js