changed style
added accept and cancel buttons
git status
Merge branch 'master' of https://github.com/tythunder/projectone
Merge branch 'master' of https://github.com/tythunder/projectone
changed style
added test