Review and update repository branches to reflect the most up-to-date status

[mybit-bot]

Introduction
Currently we have master and develop, but doesn't seem to be synced as they should be. Seems like some stuff is on master, and some stuff is on develop. Let's always have master as a working version, and develop the WIP. Let's update master with develop every once in while.

Task Description

• Merge master back to develop and fix any conflicts.
• Merge develop back to master and fix any conflicts.

[mybit-bot]

➤ Kyle Dewhurst commented:

Will get to this on Monday. Are you referring to the dapp repo in particular? I have a forked branch on my personal git repo that is far ahead of both nmaster and develop.

[mybit-bot]

➤ Jose Aguinaga commented:

Yeah that one, that’s fine, we just need to update the other ones

[mybit-bot]

➤ Jose Aguinaga commented:

Hi Kyle Dewhurst, please take some time to clean up our Github, I'll be adding continuous integration to it in the following weeks.

[mybit-bot]

➤ Kyle Dewhurst commented:

Ok you can review the merge here #35

[mybit-bot]

➤ Kyle Dewhurst commented:

Jose Aguinaga I added all the upcoming changes to the comments in the pull request. It's ready to merge if you approve it.