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
Damnit jonathan, not outputting files
Removed fixed background-size so text doesn't look like shit.
Merge pull request #23 from pranav/master

Fixed some bugs jonathan introduced >_>
Update README.md
Merge branch 'master' of github.com:pranav/dds2
merged?