init the basic URL structure
Merge remote-tracking branch 'origin/master'

Conflicts:
	Aristotle/apps/qa/views.py
	Aristotle/urls.py
Merge branch 'master' of https://github.com/funcchan/Aristotle

Conflicts:
	Aristotle/apps/qa/views.py
	Aristotle/urls.py
Merge branch 'master' of https://github.com/funcchan/Aristotle

Conflicts:
	Aristotle/apps/qa/views.py
	Aristotle/urls.py