animation
pic1
dyna
Merge branch 'reg' of http://github.com/Jayis/PDP_final into reg
Merge branch 'master' into reg

Conflicts:
	main.cpp
Merge branch 'master' into reg
gitignore
frames