modified readme to markdown
Merge pull request #1 from dlopezh/master

modified readme to markdown
test commit
Merge branch 'master' of github.com:dyep49/time-midpoint
deleting public/index and adding my database.yml to gitignore
updating personal database.yml
added config to git ignore
Merge branch 'master' of github.com:dyep49/time-midpoint
edited git ignore
Merge branch 'master' of github.com:dyep49/time-midpoint
gitignore
gitignore again
removed database yaml from cache
bye bye yaml
Merge branch 'master' of github.com:dyep49/time-midpoint into development
setting up generic devise, have no yet migrated, about to add custom fields to devise user model
adding custom fields and tweaking views for devise. Also adding home controller for post sign in landing page.
Merge pull request #3 from jtrope89/master

Adding devise and related views, home controller
Merge branch 'master' of github.com:dyep49/time-midpoint into development
location model and added some notes to a scratch folder, updated the gitignore to include that folder