changed some colors
merging stuff
changed contact form
updated site resume
merging new resume
pulling from master