Merge branch 'dev_gameplay' of https://github.com/hottehead/GameDevWeek into dev_gameplay
add gitconfig
Merge branch 'dev_gameplay' into network/replication