Merge pull request #4 from Align/master

pull down db file
Merge pull request #9 from Align/master

update
Merge pull request #11 from Align/master

update
Merge pull request #13 from Align/master

update
added test photos
Merge pull request #15 from Align/master

update
Merge pull request #17 from Align/master

update
just missing align logo & user MGMT button
Update README.md
Update README.md
my silly mac changes
just missing align logo & user MGMT button
commit so i can pay attention to class
home page

99.99% complete. Only thing left is to figure out why main.css width: is
being overwritten by bootstrap.css
my mac seems a bit behind.
Update Plan.txt
Update Plan.txt
static navbar / record.php / dir:img
resolve conflicts / search.php
conflicts