I added a file for testing
Testing
Sarsah's contribution
changed some buttons
Remove the file added previously
Added tweet count
tweetbutto
Added search and tweet buttons
Added date created to tweets
changing background from blue to red
Merge branch 'fuibranch' of https://github.com/iamSamG/django-twitter
Merge branch 'buttons' of https://github.com/Adela7/django-twitter
Alberts version
twitterbutton2
changed css
Merge branch 'dateCreated' of https://github.com/nanakay/django-twitter

Conflicts:
	twitter/static/css/base.css
	twitter/templates/mainpage.html
rounded profile image
Merge branch 'alberthome' of https://github.com/albertFiati/django-twitter

Conflicts:
	twitter/templates/login.html
Edited
Merge branch 'nicodchangebuttons' of https://github.com/Adela7/django-twitter