Completed models. Edited urls.py to handle static files for uploads.
Merge branch 'master' of github.com:danemco/CS4990

Conflicts:
	twitterclone/microblog/models.py
	twitterclone/twitterclone/settings.py
	twitterclone/twitterclone/urls.py