working on adding tracks
working
Merge branch 'dev' into feature/tracks
got full tracks working
Merge branch 'dev' into feature/tracks
had to resolve conflict with my own attempt to fix the folseg problem
tracks news
merging in tracks
updating news
didn't actually save merge resolution
keep to a default config
Merge branch 'dev' of github.com:JoFrhwld/FAVE into dev