changes example address, intro text, alert colors
merges with master