Updated some tvw stuff
tvw changes
tvw fixed merge crap
Merge branch 'tvw' of github.com:jkania7/galfacts into tvw
tvw updates
Merge branch 'tvw' of github.com:jkania7/galfacts into tvw
tvw updates
tvw updates
tvw updates, fixed merge conflict