Edited urls.py, added submitLine (form function)
fixed urls and views merge conflicts
Created the default story ('Sadek the Duck'
\Merge branch 'master' of http://github.com/meet-projects/tobecontinued-y2-2013