Integrated SMS/Calling backend into the existing flask mainframe
Merge branch 'master' of github.com:duke-compsci408-fall2014/FailSafe

Conflicts:
	call_server/call_server.py