,user

Signed-off-by: Joshua Wambua <joshua@megvel.me.ke>
Merge branch 'master' of https://github.com/museele/megvel

Conflicts:
	smarterp.pro.user