Merge remote-tracking branch 'origin/master'

fefea86c · Christopher League · 28bc5fbc · a3bc13a5 · fefea86c · fefea86c
Commit fefea86c authored Dec 20, 2018 by Christopher League
--- a/README.md
+++ b/README.md
+# nixvm
+
+Nix declarations for a Virtual Machines used in some LIU courses
\ No newline at end of file
--- a/default.nix
+++ b/default.nix
+{
+  magic-number = 42;
+  twice = x: 2*x;
+}