this might work
Merge branch 'master' of https://github.com/iwanttobeabadger/delorea

Conflicts:
	flux_capacitor.txt