Fixing indentation, adding pragma marks and integrating Hockey App #20
Merging conflicts