testing merge
Merge pull request #1 from BClark-Grad-Project/master

update
Merge pull request #2 from Hooman-majidzadeh/master

Merging into master repository.  Good job on formatting jade file.  Get rid of tables and use grid elements provided by bootstrap.

FOR FUTURE PULL REQUEST:
Make pull request only when you have completed code that is "done" status for your task of that sprint.