added .DS_Store to gitignore
Merge branch 'dev_alex'

Conflicts:
	.gitignore
changed controller inheritance
added logout button in frontend
Merge branch 'dev_alex' containing refactored controller inheritance and logout button into branch 'master'
Merge branch 'master' of github.com:secretBears/qapi