index on master: 4100942 Pushing style to Ryan.
WIP on master: 4100942 Pushing style to Ryan.
Fixed merge conflicts.