added TJ-K
my feltor
vsc feltor
fixed merge conflicts
fixed merge conflicts
tjk added
added soem tjk x-points
Merge branch 'develop' of https://github.com/mwiesenberger/feltor into develop