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.
new compose branch
updated compose section
compose location update
Merge pull request #10 from joshuamaxwell/compose

Compose location update
tweet prepending
Merge pull request #11 from joshuamaxwell/compose-javascript

tweet prepending
lookin pretty functional, i've added multiple user profiles that can be switched between (once that user control is added) adds random stream data and the date-time stamp is accurate to current time whenever a new post is added
Merge pull request #12 from joshuamaxwell/more-javascript

lookin pretty functional, i've added multiple user profiles that can be ...
just ckecked out master made no changes to really commit
compose button functioning
updated tweet-template
Merge pull request #13 from joshuamaxwell/compose-button
Merge branch 'master' of github.com:joshuamaxwell/GroupProject1