test1
Merge branch 'master' of github.com:WebValley2014/WebDev

Conflicts:
	WebDev/preprocess/views.py
Merge branch 'master' of github.com:WebValley2014/WebDev