Merged, added file saving, it works but were receiving null pointer
exception for some strange reason. Will work on fixing it, just thought
I would commit first.
Merge remote-tracking branch 'origin/master'