Merge branch 'master' of https://github.com/erik33045/pyum
Merge branch 'master' of https://github.com/erik33045/pyum

Conflicts:
	pyum/settings.py
Added comments to CalorieCalc.py
Merge remote-tracking branch 'origin/master'
added comments to django_to_parameter_object function
Merge remote-tracking branch 'origin/master'
Added some comments to YummlyDriver.py
Merge remote-tracking branch 'origin/master'
-Tweak to the about page
-Fixed user name case sensitivity
Merge remote-tracking branch 'origin/master'
Merge branch 'origin/master'

Conflicts:
	pyum/settings.py