Merge pull request #1 from jpsiepert/master

set up app.js
Merge pull request #2 from jpsiepert/master

added folders
Merge pull request #3 from jpsiepert/master

ui router started
Merge pull request #1 from KorySumsion/master

Server.js added
most of the basic signup is set up now.
Merge pull request #4 from MarkTonkinson/master

Merge pull request #1 from KorySumsion/master
Merge pull request #2 from KorySumsion/master

Merge pull request #4 from MarkTonkinson/master
Merge pull request #5 from jpsiepert/master

UI router working for login and signup
Merge branch 'master' of https://github.com/MarkTonkinson/forever-planned

erge conflicts
merged app.js
Merge pull request #6 from MarkTonkinson/master

Mark's First Merge
just trying to get a pull merge