changed heading
Merge pull request #1 from MC3D/master

changed heading
test change to text
adds text to html
"changed text"
"changed color to red"
Merge pull request #2 from chad-m/new-style

adds text to html
Merge pull request #4 from Jeff-Coons/test-change

Test change
Merge pull request #3 from plove13x/with

With
 changed js
CONSOLE LOG DOESN'T ROCK
Merge pull request #6 from plove13x/master

CONSOLE LOG DOESN'T ROCK
Merge branch 'master' of github.com:chad-m/swamp-rabbit-test

Conflicts:
	app/scripts/main.js
Some krazy stylez
Merge branch 'krazyStyles' of https://github.com/plove13x/swamp-rabbit-test into krazyStyles

Conflicts:
	app/styles/main.scss
Baller text
Merge remote-tracking branch 'upstream/master' into with
Yo
Merge remote-tracking branch 'upstream/master' into with

Conflicts:
	app/index.html