Initial commit
Delete apache2.conf~
Delete mysite.conf~
Delete nginx.conf~
Delete helloworld.wsgi~
Delete index.html~
Delete test.html~
Delete test.html
Delete views.py~
Delete views.pyc
Delete views.py
Delete apache2.conf
Update mysite.conf
Update views.py
Initial commit
Initial commut
Merge branch 'master' of https://github.com/annoyingbutters/mysite

Conflicts:
	mysite.conf
	mysite.conf~
	mysite/polls/views.py
	mysite/test.html
	mysite/test.html~
first commit
Initial commit
Merge branch 'master' of https://github.com/annoyingbutters/mysite