made a change
made more changes
hotfix solved
Removed unneded methods
Merge branch 'testing'

Conflicts:
	GitTest/ViewController.m