Merge pull request #1 from mabrauer/master

I want to get the latest changes from mabrauer/hyperloop_sl into mwcollaborator/hyperloop_sl
Added efficiency to battery charge and discharge.
Merge remote-tracking branch 'refs/remotes/origin/master'
Merge pull request #5 from mwcollaborator/master

I added efficiency to battery charge and discharge