updated index page and started on conflict resolution
Merge branch 'roninkelt' of github.com:roninkelt/rpgx_cgd into roninkelt