Initial Commit
add entire project to git
Changed phone number in all files
	* from 5315  to 5314
changed contact page title, started new branch
removed hidden files
Merge branch 'new_feature'
first text edit
text edit 2
Merge branch 'text_edits'

Resolved conflicts in merge
slight formatting change - open para with caps
added minor text to newsletter para
Merge branch 'master' of https://github.com/anastass/explore_california
add ignore file