Merge remote-tracking branch 'origin/master' into katy
here's the template for the tweet div:
Merge branch 'edwin' of github.com:joshuamaxwell/GroupProject1 into tweet-box
Added tweet box template
profile framework add ons
Merge branch 'tweet-box' of https://github.com/joshuamaxwell/GroupProject1 into katy

Conflicts:
	app/index.html
Updated styles
updated header and sidebar styles
added all of katys changes to html sidebar
organization of tweet and compose boxes
updated body style
updated header syles
finish merging
Merge pull request #5 from joshuamaxwell/katy

Merging some style foundations
Merge pull request #6 from joshuamaxwell/master

Merge pull request #5 from joshuamaxwell/katy
fixing merge conflicts
 trying to find out how to get a consistent version of the page