gitignore
selecao de disciplinas
htaccess
gitignore
Merge branch 'master' of https://github.com/werepa/Simulex

Conflicts:
	.gitignore