Alignment.
Merge branch 'p2p' of https://github.com/Shaptic/RiseOfKings into p2p