Adding scriptfile and updating HTML flie
fixing issues
Final submission of assignment2
maybe this will work now
Resolving some merge conflicts that arose
merge bmwaechter