Updated frames
Updated gitignore file
Merge branch 'master' of https://github.com/BlightOfYou/a2

Conflicts:
	src/Phase2/nbproject/project.properties
Updated gitignore file