Removed DB info
Update conDB.php
Updates to site that weren't made in Git
Merge branch 'master' of https://github.com/elizuck/circulate

Conflicts:
	conDB.php
Create README.md

Mirror of the project guidelines page in the wiki. Easier access. :)
Update README.md

quick edit
ran script to fix newline problem
reformatted readme
Modified Readme
Newline fix and Google Plus localhost integration
Added current Circulate.me DB SQL backup
setup localhost settings
merged newline fix into my localhost settings
changed site init
Added a .gitignore

.gitignore are files that will be ignored by git when pushing to a repository. These are important for settings files that we don't want changed on the server. Right now I added

.htaccess
lib/siteInit.php
conDB.php
fixed the gitignore

.gitignore doesn't work on files that are already being tracked by git, so I fixed that. It should work now.
Added Bootstrap as design framework

Bootstrap solidifies how CSS/HTML are written, and allows an easy way to create a responsive design.

I will be refactoring the majority of the layout.