local changes ignored
Merge branch 'master' of https://github.com/AlanOctavius/DaveCon2K14

Conflicts:
	DaveCon/DaveCon_Data/output_log.txt