updating the home page layout, ignoring the db file
Merge pull request #2 from Johnathans/john
Merged master fixed conflict.
reset git ignore to ignore db files
reset git ignore to ignore db files
forcing me to add my db files??
styles for header, header + footer into partials, added tinymce
Merge pull request #3 from Johnathans/leland
added pages and updated routes file
Merge branch 'master' into john
added additional pages
add partials and views