Misc. Sync of dynamic resources
Added AssignmentTracker/gen/* to ignore track list
implicit head resolution merge
Fixed auto merge issue
Undo addition of /gen/* ignore - causes issues with merge
Merge branch 'master' of https://github.com/TeamZhao/Assignment-Tracker

Conflicts:
	AssignmentTracker/gen/com/example/assignmenttracker/R.java