Merge pull request #15 from jonathanwgoodwin/master

Login page fixes.
Merge pull request #19 from jonathanwgoodwin/master

Convert.php dpi fixes
Merge pull request #20 from jonathanwgoodwin/master

Many changes to our Initial_db file
Merge pull request #21 from jonathanwgoodwin/master

Slide ---> Machine Mapping
Merge pull request #23 from pranav/master

Fixed some bugs jonathan introduced >_>
Update README.md
Scale slides to fit the page.

Uses background-size to scale images so that they take up as much room on the page as they can while preserving their aspect ratio.
Merge pull request #25 from ali/master

Scale slides to fit the page.
Fixed merge conflict