#time 2h 30m

* Added a overlay image for profile, so you can tell who's turn it is
* Created a directive to merge 2 images
* Finished the file upload on the home page, so now you should be able use iphone and ipad (untested)
* Added some of the data from view into Main ctrl so it could be used in several methods
* Added flag for fileUploading, applies to files / camera to file only
* Added resize for the file uploads
* Updated the css for game-room, using white because overly graphic uses white
* Changed the user images to the canvas-combine-img
* Adding the psd for the profile overlay (It is currently horrible because it is pixelated)