Updated README to reflect assignment
Removing Angular and correcting CSS paths.
Merge remote-tracking branch 'origin/master' into Indigo
Merge pull request #9 from danielleadams/Indigo

Indigo
add create survey erb for user with basic forms
Merge pull request #10 from danielleadams/Richard

Richard
Adding bootstrap and base templating functionality
Merge remote-tracking branch 'origin/master' into Indigo
Merge pull request #11 from danielleadams/Indigo

Indigo
add survey and question forms with ajax
Popup window functional
Merge branch 'master', remote-tracking branch 'origin' into Indigo
add survey and question forms with ajax
fix merge conflicts
Minor path repairs for presentation
Merge remote-tracking branch 'origin/master' into Indigo

Conflicts:
	public/application.js
Merge pull request #12 from danielleadams/Indigo

Indigo
route edits in .js
fix conflicts
Adding default login 'username' 'password'