test multi-user
Merge pull request #1 from xilp/develop

merged
Merge branch 'master' of xilp.github.com:xilp/cost into develop
added templates. stored entrys(not working yet)