-Got rid of some hardcoded values.
Merge branch 'master' of https://github.com/swoogles/Personal