Merge pull request #1 from dalbemil/master

Getting the changes
Edited master page according to what kisha sent.
Masterpage change
Merge pull request #10 from rmagrare7/master

Changed my files