faculty focuse first commit
Merge branch 'master' of github.com:ayumilong/facultyFocus

Conflicts:
	.gitignore