committing Pi fix
 so everything seems to be kinda working
Merge pull request #10 from dknip/master

Merging new gui
local commit
Merge branch 'master' of https://github.com/AaronGreenberg/ELEFAN

Conflicts:
	data/abra_alba_1file.dat
fixed year issue silly y vs Y
Merge pull request #8 from AaronGreenberg/master

Just getting the newst version this morning