finish merging
Merge pull request #6 from joshuamaxwell/master

Merge pull request #5 from joshuamaxwell/katy
 trying to find out how to get a consistent version of the page
 still working with tweet example
Merge branch 'master' of github.com:joshuamaxwell/GroupProject1 into joshua
added in sample tweet into the stream and enclosed tweet-template in script tags for later invokation from javascript
Merge pull request #9 from joshuamaxwell/joshua

please merge Joshua branch.