3 commits

Author	SHA1	Message	Date
Magnus Hoff	df39e658cd	Start implementing merge, for #23	2017-11-16 15:38:45 +01:00
Magnus Hoff	2665fb3b8a	Add a test for State	2017-11-15 16:27:28 +01:00
Magnus Hoff	403158ddda	Split entry point into main.rs and lib.rs. ... This might enable some integration tests	2017-11-15 15:06:18 +01:00