gitignore
Merge branch 'dev' of https://github.com/Prototype-Group/css3-animation-showcase into dev
dev
Merge branch 'dev' of https://github.com/Prototype-Group/css3-animation-showcase into dev

Conflicts:
	resources/js/main.js