updated API code placement
Syncing work from Sunday's meeting
stash
Merge pull request #18 from PCS-Javascript-Junkies/charity

Charity
fxed my local branch
filled theinside brewery theme
Merge pull request #19 from PCS-Javascript-Junkies/crouseMatthew

Crouse matthew
merge in master, fix conflicts