finished testing for confirming stories
Merge branch 'master' into lovrenca
minor update
Merge branch 'master' into lovrenca
added reject story