initial commit
Merge branch 'master' of https://github.com/iaaprograms/sis-angular-laravel

Conflicts:
	README.md