Merge remote-tracking branch 'origin/front_and_backend' into styles2
twitter styling in progress
merged with styles