Merge pull request #11 from AaronGreenberg/master

newest version
k-scan plot margins changed and new aa file
Merge pull request #15 from dknip/master

last changes from today finally final!