pulling
deleted flat ui
Merge branch 'master' of https://github.com/Cthulu93/CS121-2014

Conflicts:
	Glossalalia/Glossalalia.xcodeproj/project.pbxproj
	Glossalalia/Glossalalia/GADataViewController.h
	Glossalalia/Glossalalia/GADataViewController.m
	Glossalalia/Glossalalia/GAElementViewController.h
	Glossalalia/Glossalalia/GAElementViewController.m
	Glossalalia/Glossalalia/GATestViewController.h
	Glossalalia/Glossalalia/GATestViewController.m