Adding
new
first
Create README.md
Merge branch 'master' of https://github.com/Abipathak/brust-page
Merge branch 'master' of https://github.com/Abipathak/brust-page into abibranch
 this is ok
THis is ok
Master changes
Master changes
Merge branch 'master' of github.com:Abipathak/brustpage into abibranch

Conflicts:
	add.db
	addhere/__init__.pyc
	addhere/admin.pyc
	addhere/context_processors.pyc
	addhere/models.pyc
	addhere/settings.pyc
	addhere/urls.pyc
	addhere/views.pyc
	addhere/wsgi.pyc
Remove pycharm
Lots of changes
Merge branch 'master' of github.com:Abipathak/brustpage

Conflicts:
	add.db
	addhere/__init__.pyc
	addhere/admin.pyc
	addhere/context_processors.pyc
	addhere/models.py
	addhere/models.pyc
	addhere/settings.py
	addhere/settings.pyc
	addhere/static/css/style.css
	addhere/templates/carousel.html
	addhere/templates/home.html
	addhere/templates/main-banner.html
	addhere/templates/nav.html
	addhere/urls.pyc
	addhere/views.py
	addhere/views.pyc
	addhere/wsgi.pyc
aFew changes
Merge branch 'abibranch' of github.com:Abipathak/brustpage into abibranch

Conflicts:
	add.db
	addhere/__init__.pyc
	addhere/admin.pyc
	addhere/context_processors.pyc
	addhere/models.pyc
	addhere/settings.pyc
	addhere/urls.pyc
	addhere/views.pyc
	addhere/wsgi.pyc
Some more changes in html
This is new updates
Merge branch 'abibranch' of github.com:Abipathak/brustpage into abibranch

Conflicts:
	add.db
	addhere/admin.pyc
	addhere/context_processors.pyc
	addhere/settings.py
	addhere/settings.pyc
	addhere/static/css/style.css
	addhere/templates/carousel.html
	addhere/templates/home.html
	addhere/templates/main-banner.html
	addhere/urls.pyc
	addhere/views.py
	addhere/views.pyc
Merge branch 'abibranch' of github.com:Abipathak/brustpage

Conflicts:
	addhere
	manage.py