Merge branch 'master' into marty
Fixed a bug with if statement in Nav that was displaying an incorrect message
Merge branch 'marty'
Merge branch 'Dustin'
Merge branch 'master' into Dustin