Merge pull request #24 from 51seven/staging

adsfasdfasdfadsfasdfasdf
Merge pull request #25 from 51seven/development

Merge pull request #24 from 51seven/staging