Merge branch 'master' of github.com:corydominguez/gator-server

* 'master' of github.com:corydominguez/gator-server:
  extended Twython streamer api, created first pass db schema and controls, created initial api endpoint

Conflicts:
	gator/db.py
	gator/link_streamer.py
Merge branch 'master' of github.com:corydominguez/gator-server

* 'master' of github.com:corydominguez/gator-server:

Conflicts:
	gator/link_streamer.py