fixed some tabbing problems
Merge branch 'master' of https://github.com/winsto99/assoc-neural-oscs

updated readme online - merge changes I made offline
added tester file to 2_1