Changes made by Noel Robinos (robinosn@gmail.com).
Merge branch 'master' of https://github.com/nrobinos/NoelApp.git

Conflicts:
	Purdue Conference Highlights/Purdue Conference Highlights.proj