First commit
Merge branch 'master' of github.com:abarrera05/nglr

Conflicts:
	labs/notepad/public/index.html
Merge branch 'master' of github.com:abarrera05/nglr

Conflicts:
	labs/notepad/public/index.html
Second commit