Merge branch 'master' of https://github.com/dopefishh/cc1516

author pimjager <pim@pimjager.nl>

Tue, 14 Jun 2016 20:45:42 +0000 (22:45 +0200)

committer pimjager <pim@pimjager.nl>

Tue, 14 Jun 2016 20:45:42 +0000 (22:45 +0200)
author pimjager <pim@pimjager.nl>
Tue, 14 Jun 2016 20:45:42 +0000 (22:45 +0200)
committer pimjager <pim@pimjager.nl>
Tue, 14 Jun 2016 20:45:42 +0000 (22:45 +0200)
diff --cc deliverables/report/report.tex
Simple merge
diff --cc deliverables/report/sem.tex
Simple merge
author	pimjager <pim@pimjager.nl>
	Tue, 14 Jun 2016 20:45:42 +0000 (22:45 +0200)
committer	pimjager <pim@pimjager.nl>
	Tue, 14 Jun 2016 20:45:42 +0000 (22:45 +0200)
		1	2
deliverables/report/report.tex	patch \|	diff1 \|	diff2 \|	blob \| history
deliverables/report/sem.tex	patch \|	diff1 \|	diff2 \|	blob \| history