changed form too
fixed conflicts
minor changes
Merge branch 'master' of https://github.com/peoplespete/memory
styled and altered view
Merge branch 'master' of https://github.com/peoplespete/memory