Database Integration 3
Metadata
Merge branch 'master' into Bambrick

Conflicts:
	FindADoctorTA/app/controllers/home.js
	FindADoctorTA/build/iphone/FindADoctorTA.xcodeproj/project.pbxproj

FindADoctorTA/build/iphone/build/Debug-iphonesimulator/FindADoctorTA.app
.dSYM/Contents/Resources/DWARF/FindADoctorTA

FindADoctorTA/build/iphone/build/Debug-iphonesimulator/FindADoctorTA.app
/FindADoctorTA

FindADoctorTA/build/iphone/build/FindADoctorTA.build/Debug-iphonesimulat
or/FindADoctorTA.build/FindADoctorTA.dep

FindADoctorTA/build/iphone/build/FindADoctorTA.build/Debug-iphonesimulat
or/FindADoctorTA.build/Objects-normal/i386/FindADoctorTA_dependency_info
.dat

FindADoctorTA/build/iphone/build/FindADoctorTA.build/Debug-iphonesimulat
or/FindADoctorTA.build/build-state.dat
Updated ignore files

Removing build files
Update .gitignore
Merge branch 'master' into Bambrick

Conflicts:
	.metadata/.log
	.metadata/.plugins/com.aptana.index.core/1051954702.index

.metadata/.plugins/org.eclipse.core.runtime/.settings/com.appcelerator.t
itanium.ui.prefs

.metadata/.plugins/org.eclipse.core.runtime/.settings/com.aptana.theme.p
refs
Merge branch 'Bambrick' of https://github.com/dabam08/FindADoctorTA into Bambrick

Conflicts:
	.metadata/.log
	.metadata/.plugins/com.aptana.index.core/1051954702.index

.metadata/.plugins/org.eclipse.core.runtime/.settings/com.appcelerator.t
itanium.ui.prefs

.metadata/.plugins/org.eclipse.core.runtime/.settings/com.aptana.theme.p
refs
Merge branch 'Bambrick'

Conflicts:
	.gitignore