added second template and additional url
added second template and url
resolved merge conflict with master
Created addition calculator
Added multiply function @/mult/x/y
Merge branch 'master' into dev-swittli2
Merge branch 'master' into dev-swittli2
DB retrieval implemented
added user form to add posts
Real commit of form