add capistrano
Merge branch 'using-capistrano' into testfix
Merge branch 'testfix' into testmaster
typo
Merge branch 'testmaster' into oke
Merge branch 'test' into oke