Modified some stuff in celery/config
moved app/tests.py to tests.py
Merge branch 'master' of github.com:JRoszkow789/alarmaway

Conflicts:
	celeryconfig.py