First update after new EC2 creation
Merge branch 'develop' of github.com:MarcusQuigley/bitstarter into develop