Initial comit
Initial commit
Merge branch 'master' of github.com:PabloRios/Portal

Conflicts:
	.gitignore
	README.md