Merge branch 'master' of https://github.com/keli5466/KellyMAD

Conflicts:
	Project1/Project1/Base.lproj/Main.storyboard
FINAL PROJECT 1

 finished project