blehh
Merge branch 'master' of https://github.com/jalant/StoopApplication
fixing bugs