Merge pull request #24 from jonthedecepticon/master

back-end re-done
Merge pull request #25 from jonthedecepticon/master

This should work
add ignore stuffs