Modify admin.py
Add urls.py and templates
Fix settings.py
Add interface, templates, modify views
Minor fix base.html
Reindent templates
Add FB login button to base.html
modify base.html
+ add custom
- modify index
- modify post
+ add base.html
+ bootstrap
+ bootstrap
- edit models
- edit views
- modify settings
Merge https://github.com/infrmtcs/neptune

Conflicts:
	confession/urls.py
	confession/views.py
	neptune/settings.py
	static/css/custom.css
	templates/base.html
	templates/index.html
	templates/post.html
Merge https://github.com/infrmtcs/neptune

Conflicts:
	confession/urls.py
	confession/views.py
	neptune/settings.py
	static/css/custom.css
	templates/base.html
	templates/index.html
	templates/post.html