Merge pull request #3 from pivotaccess2007/master

Merge pull request #5 from watshisface/master
welcome

new welcome page
Merge remote-tracking branch 'marvin/master'