it works!
Merge branch 'master' of github.com:codeforanchorage/realtime-bus-sms

Conflicts:
	.gitignore