first commit
Merge branch 'master' of https://github.com/Rawks/fase-project

NOTE: THIS IS JUST A BACKUP, PROJECT IS UNFINISHED AS OFF MONDAY / 09 / 2014