resolving conflicts in branches
added dispatch.py
Added dispatch.py to give email functionality
Merge branch 'development'