New urls added and some dummy views for them.
Merge branch 'master' of github.com:caujka/TripJournal

Conflicts:
	trip_journal_app/templates/index.html
New urls and some minor changes to main page
Merge branch 'master' of github.com:caujka/TripJournal

Conflicts:
	trip_journal_app/views.py
minor changes to urls and dummy views
Pictures can be saved from /upload/story_id
Image uploads and save changes to existing stories and some cleanup
Merge branch 'master' of github.com:caujka/TripJournal

Conflicts:
	trip_journal_app/static/css/main.css
	trip_journal_app/views.py