before merge feeds
Merge branch 'master' into ryan-foundation
twitter hash
Merge pull request #30 from RKim220/feedmerge

merged completed
merge feed
added privacy policy modal, need to style more though
update footer
Merge pull request #31 from RKim220/ryan-foundation

Ryan foundation
update footer, comment out FB stuff
update homepage link in top bar
update feed with instagram pics
merge conflict
Merge pull request #32 from RKim220/ryan-foundation

Ryan foundation
merge conflict resolve
fix merge conflicts
styling timeline part 1