adding animate.css, more frame work setup
Merge branch 'master' into ericMonday
fixing conflict
Conflicts:
	css/animate.css