Commit Graph

2 Commits

Author SHA1 Message Date
akshayaurora c121c1aa4e reorganize files and bring code inline with current master
Conflicts:
	lib/simple_config.py
2015-09-03 14:20:37 +02:00
qua-non 1bbb211671 rebase to master and add resources, numerous other small fixes 2015-09-03 14:17:58 +02:00