add Edna's change
a
fix animation bug
Merge branch 'Vincent' of https://github.com/Danny417/FairWeather into Vincent
add to ignore file
add git ignore
Merge branch 'Vincent' into Danny

Conflicts:
	application/views/mainView.php
Merge branch 'Danny' into Jacky
Merged with Danny's branch