Initial commit
wysiwyg editor
upload allowed wysiwyg editor
upload allowed wysiwyg editor
upload allowed wysiwyg editor
upload allowed wysiwyg editor
upload allowed wysiwyg editor
upload allowed wysiwyg editor
upload allowed wysiwyg editor
upload allowed wysiwyg editor
upload allowed wysiwyg editor
upload allowed wysiwyg editor
ignore
upload allowed wysiwyg editor
upload allowed wysiwyg editor
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	app/admin.py
	app/models.py
	app/static/css/foundation.css
	app/templates/app/about.html
	app/templates/app/base.html
	app/templates/app/index.html
	app/views.py
	backpacker/settings.py
	backpacker/urls.py
upload allowed wysiwyg editor