Luke and Sam working together on server stuff
no message
Merge branch 'master' of https://github.com/sdrozzy/Depo

# By Jiahe Kuang
# Via Jiahe Kuang
* 'master' of https://github.com/sdrozzy/Depo:
  added transaction hash key
  preloaded public keys
  new UI

Conflicts:
	Depo/Base.lproj/Main.storyboard
Basic changes to code layouts
Merge branch 'master' of https://github.com/sdrozzy/Depo

# By phillipou94
# Via phillipou94
* 'master' of https://github.com/sdrozzy/Depo:
  just logging one thing
  lets see if this works
  pre pull commit