initial data for  subjects
Merge remote-tracking branch 'origin/master'

Conflicts:
	AUchievement/views.py
initial data for  subjects'