#70 added license headers to all files
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project into 70-license-headers

Conflicts:
	gen/ca/ualberta/CMPUT301F13T02/chooseyouradventure/R.java
Merge pull request #80 from klindenbach/70-license-headers

#70 added license headers to all files