commit
Updated some files
updated some of the fields
ignore all files in the /bin directory
changes to html/css
Merge remote-tracking branch 'jake/master'
another commit
Added Alana's changes