update stuff
fix merging
added academic history function
merge
fix some files?
merge
Merge branch 'developing' of http://github.com/calmajos/CSE136-Project into developing